merge trunk
authorKenichi Handa <handa@etlken>
Thu, 6 May 2010 00:50:39 +0000 (09:50 +0900)
committerKenichi Handa <handa@etlken>
Thu, 6 May 2010 00:50:39 +0000 (09:50 +0900)

Trivial merge